From: kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Date: Fri, 2 Jun 2006 08:20:58 +0000 (+0100)
Subject: [IA64][HVM] Enable CGA acceleration for VTI.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15972^2~49^2~24
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=78f168bc8d34a9cfe488f7808895294f007a900c;p=xen.git

[IA64][HVM] Enable CGA acceleration for VTI.
Signed-off-by: Kevin Tian <kevin.tian@intel.com>
---

diff --git a/tools/ioemu/hw/cirrus_vga.c b/tools/ioemu/hw/cirrus_vga.c
index 8f3ac73d26..689bbacf4d 100644
--- a/tools/ioemu/hw/cirrus_vga.c
+++ b/tools/ioemu/hw/cirrus_vga.c
@@ -2460,7 +2460,6 @@ static CPUWriteMemoryFunc *cirrus_linear_bitblt_write[3] = {
 };
 
 extern FILE *logfile;
-#if defined(__i386__) || defined (__x86_64__)
 static void * set_vram_mapping(unsigned long begin, unsigned long end)
 {
     unsigned long * extent_start = NULL;
@@ -2540,10 +2539,6 @@ static int unset_vram_mapping(unsigned long begin, unsigned long end)
     return 0;
 }
 
-#elif defined(__ia64__)
-static void * set_vram_mapping(unsigned long addr, unsigned long end) {}
-static int unset_vram_mapping(unsigned long addr, unsigned long end) {}
-#endif
 extern int vga_accelerate;
 
 /* Compute the memory access functions */
diff --git a/tools/ioemu/hw/vga.c b/tools/ioemu/hw/vga.c
index 2d9e6449bf..42d4327ddb 100644
--- a/tools/ioemu/hw/vga.c
+++ b/tools/ioemu/hw/vga.c
@@ -1995,6 +1995,7 @@ void vga_common_init(VGAState *s, DisplayState *ds, uint8_t *vga_ram_base,
     s->get_resolution = vga_get_resolution;
     /* XXX: currently needed for display */
     vga_state = s;
+    vga_bios_init(s);
 }
 
 
@@ -2082,7 +2083,6 @@ int vga_initialize(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base,
 #endif
     }
 
-    vga_bios_init(s);
     return 0;
 }
 
diff --git a/tools/ioemu/vl.c b/tools/ioemu/vl.c
index a39ff62252..2692ea5d80 100644
--- a/tools/ioemu/vl.c
+++ b/tools/ioemu/vl.c
@@ -2499,7 +2499,7 @@ int set_mm_mapping(int xc_handle,
     xc_domain_getinfo(xc_handle, domid, 1, &info);
 
     if ( xc_domain_setmaxmem(xc_handle, domid,
-                             (info.nr_pages + nr_pages) * PAGE_SIZE/1024) != 0)
+                             info.max_memkb + nr_pages * PAGE_SIZE/1024) !=0)
     {
         fprintf(logfile, "set maxmem returned error %d\n", errno);
         return -1;